From 42d97c380e50aded08b1248789bf2706c789d894 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 12 Jul 2014 21:04:54 -0400 Subject: [PATCH] widget-factory: Use the new ::activatable property --- demos/widget-factory/widget-factory.c | 4 +- demos/widget-factory/widget-factory.ui | 210 ++++++++++++++----------- 2 files changed, 119 insertions(+), 95 deletions(-) diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c index fe7b3951a7..4ac5ec9b6c 100644 --- a/demos/widget-factory/widget-factory.c +++ b/demos/widget-factory/widget-factory.c @@ -603,11 +603,11 @@ activate (GApplication *app) gtk_list_box_set_header_func (GTK_LIST_BOX (widget), update_header, NULL, NULL); g_signal_connect (widget, "row-activated", G_CALLBACK (row_activated), NULL); - widget = gtk_widget_get_parent ((GtkWidget *)gtk_builder_get_object (builder, "listboxrow3")); + widget = (GtkWidget *)gtk_builder_get_object (builder, "listboxrow3"); widget2 = (GtkWidget *)gtk_builder_get_object (builder, "listboxrow3image"); g_object_set_data (G_OBJECT (widget), "image", widget2); - widget = gtk_widget_get_parent ((GtkWidget *)gtk_builder_get_object (builder, "listboxrow4")); + widget = (GtkWidget *)gtk_builder_get_object (builder, "listboxrow4"); widget2 = (GtkWidget *)gtk_builder_get_object (builder, "info_dialog"); g_object_set_data (G_OBJECT (widget), "dialog", widget2); diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui index 64348005d6..c2d952af3d 100644 --- a/demos/widget-factory/widget-factory.ui +++ b/demos/widget-factory/widget-factory.ui @@ -2102,127 +2102,151 @@ Suspendisse feugiat quam quis dolor accumsan cursus. none True - + True - horizontal - - - True - Row 1 - start - enter - 6 - - - True - - + False - + True - end - center - 6 - 6 - 12 - 12 + horizontal + + + True + Row 1 + start + enter + 6 + + + True + + + + + True + end + center + 6 + 6 + 12 + 12 + + - + True - horizontal + False - + True - Row 2 - start - center - 6 - - - True - - - - horizontal - True - end - center - 6 - 6 - 12 - 12 - False - 150 - adjustment1 + + + True + Row 2 + start + center + 6 + + + True + + + + + horizontal + True + end + center + 6 + 6 + 12 + 12 + False + 150 + adjustment1 + + - + True - horizontal + True - - True - Row 3 - start - center - 6 - - - True - - - - + True - object-select-symbolic - 1 - end - center - 6 - 6 - 12 - 12 - 0 + horizontal + + + True + Row 3 + start + center + 6 + + + True + + + + + True + object-select-symbolic + 1 + end + center + 6 + 6 + 12 + 12 + 0 + + - + True - horizontal + True - - True - Row 4 - start - center - 6 - - - True - - - - + True - object-select-symbolic - 1 - end - center - 6 - 6 - 12 - 12 - 0 + horizontal + + + True + Row 4 + start + center + 6 + + + True + + + + + True + object-select-symbolic + 1 + end + center + 6 + 6 + 12 + 12 + 0 + + -- 2.30.2